core: Make ostree_get_relative_object_path() private

I plan to rename all of these APIs to use the term 'loose', so that it
makes more sense after pack files are introduced.  External users
should not use them; instead use _load_variant() or _read_commit().

diff --git a/doc/ostree-sections.txt b/doc/ostree-sections.txt
index 428c69f240170ea38c4a83c9d04a958f08d26f41..dcdf40bf652d717874f87dc8a1db7085bd77ea87 100644 (file)
--- a/doc/ostree-sections.txt
+++ b/doc/ostree-sections.txt
@@ -28,7 +28,6 @@ ostree_object_name_serialize
 ostree_object_name_deserialize
 ostree_object_to_string
 ostree_object_from_string
-ostree_get_relative_object_path
 ostree_get_xattrs_for_file
 ostree_set_xattrs
 ostree_content_stream_parse

diff --git a/src/libostree/ostree-core-private.h b/src/libostree/ostree-core-private.h
index 548a3d68defcb7ad20a1ee3a3aa693f206ebdadf..8145cc3351750d825b75a35b0ea8378609349636 100644 (file)
--- a/src/libostree/ostree-core-private.h
+++ b/src/libostree/ostree-core-private.h
@@ -95,6 +95,11 @@ _ostree_make_temporary_symlink_at (int             tmp_dirfd,
  */
 #define _OSTREE_LOOSE_PATH_MAX (256)
 
+char *
+_ostree_get_relative_object_path (const char        *checksum,
+                                  OstreeObjectType   type,
+                                  gboolean           compressed);
+
 void
 _ostree_loose_path (char              *buf,
                     const char        *checksum,

diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c
index 6d2b661c797ddea1fed7e74c55277b46d4f96adb..1c87009cfcb9613f1400910bd1757f340853d6ec 100644 (file)
--- a/src/libostree/ostree-core.c
+++ b/src/libostree/ostree-core.c
@@ -1497,8 +1497,8 @@ _ostree_loose_path_with_suffix (char              *buf,
             suffix);
 }
 
-/**
- * ostree_get_relative_object_path:
+/*
+ * _ostree_get_relative_object_path:
  * @checksum: ASCII checksum string
  * @type: Object type
  * @compressed: Whether or not the repository object is compressed
@@ -1506,9 +1506,9 @@ _ostree_loose_path_with_suffix (char              *buf,
  * Returns: (transfer full): Relative path for a loose object
  */
 char *
-ostree_get_relative_object_path (const char         *checksum,
-                                 OstreeObjectType    type,
-                                 gboolean            compressed)
+_ostree_get_relative_object_path (const char         *checksum,
+                                  OstreeObjectType    type,
+                                  gboolean            compressed)
 {
   GString *path;
 

diff --git a/src/libostree/ostree-core.h b/src/libostree/ostree-core.h
index 743ca8f11ba347f88d2d744ff9af22b68ffb71c4..0e06048fe3f8182cec071d0316fad8a7a95d9310 100644 (file)
--- a/src/libostree/ostree-core.h
+++ b/src/libostree/ostree-core.h
@@ -167,10 +167,6 @@ void ostree_object_from_string (const char *str,
                                 gchar     **out_checksum,
                                 OstreeObjectType *out_objtype);
 
-char *ostree_get_relative_object_path (const char        *checksum,
-                                       OstreeObjectType   type,
-                                       gboolean           compressed);
-
 gboolean ostree_get_xattrs_for_file (GFile         *f,
                                      GVariant     **out_xattrs,
                                      GCancellable  *cancellable,

diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index 02f27e2786609cc7381f6c5d73fa1d424508acf0..eb09532b3a0fcd9a0f1a00cf5cf8bb7c6f164004 100644 (file)
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -1012,7 +1012,7 @@ _ostree_repo_get_object_path (OstreeRepo       *self,
 
   compressed = (type == OSTREE_OBJECT_TYPE_FILE
                 && ostree_repo_get_mode (self) == OSTREE_REPO_MODE_ARCHIVE_Z2);
-  relpath = ostree_get_relative_object_path (checksum, type, compressed);
+  relpath = _ostree_get_relative_object_path (checksum, type, compressed);
   ret = g_file_resolve_relative_path (self->repodir, relpath);
   g_free (relpath);
 

diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index 763ab5b14dd5a09c9917c3fb70df5b223dfd5c00..58cef3f4987fbc3bbb5c0f6b51fad092ab7a3fdd 100644 (file)
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -994,7 +994,7 @@ enqueue_one_object_request (OtPullData        *pull_data,
     }
   else
     {
-      objpath = ostree_get_relative_object_path (checksum, objtype, TRUE);
+      objpath = _ostree_get_relative_object_path (checksum, objtype, TRUE);
       obj_uri = suburi_new (pull_data->base_uri, objpath, NULL);
     }